<<<<<<< HEAD
package edu.stu.cs.software.family.express.domain;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;

import edu.stu.cs.software.family.base.domain.BaseEntity;

@Table(name = "O_EXPRESS_COURIERCP")
@Entity
public class CourierCP extends BaseEntity<Long> {
	
	/**
	 * 
	 */
	private static final long serialVersionUID = 1L;
	@Column(name = "NAME")
	String name;
	@Column(name = "ADDR")
	String addr;
	
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	public String getAddr() {
		return addr;
	}
	public void setAddr(String addr) {
		this.addr = addr;
	}
	
}
=======
package edu.stu.cs.software.family.express.domain;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;

import edu.stu.cs.software.family.base.domain.BaseEntity;

@Table(name = "O_EXPRESS_COURIERCP")
@Entity
public class CourierCP extends BaseEntity<Long> {
	
	/**
	 * 
	 */
	private static final long serialVersionUID = 1L;
	@Column(name = "NAME")
	String name;
	@Column(name = "ADDR")
	String addr;
	
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	public String getAddr() {
		return addr;
	}
	public void setAddr(String addr) {
		this.addr = addr;
	}
	
}
>>>>>>> origin/master
